From 121e629a9bcacd55ae49ef1d768171a07f963762 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Wed, 1 Nov 2006 20:17:04 +0000 Subject: [PATCH] Add transform filter to filter formular. --- win32/gui-2/filter.dfm | Bin 8303 -> 8761 bytes win32/gui-2/filter.pas | 51 +++++++++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/win32/gui-2/filter.dfm b/win32/gui-2/filter.dfm index c9967bf7398c43ac24f0fe57b6155f13b45a4adf..53766bae63bb5b12b1e91b62dcf0465a08a2644f 100644 GIT binary patch delta 513 zcmaFwu+v58KNmxYTad4tr%#A$5QBk$s?tQE7RCb`rzbIrurRWQXQq^7F#9vHd8B5h zXOu9{p3KXn!^phZim8c@ao6O%0K6!b`o)5WZB#-qQt_URFdbBno}@& zjf4rD{anJF(PXl`WDFzY<{HUQY^Izc?nU{f1y1=D-04XnMTvREY57IDEIz4eB}@#= zA^8PN4CwYVnM}SQAm+gbSDjdrnV-iIl9=RQl#*J+#K6EA;+&tGln*qNCpjP8)C#bv zB2ZJeGfYm9v9D(YYsyGX&IY+88C?$tSdSP)4^u8QAeaQ%of8W{ma}of9fRZ!cK_ixF(A1k~0txUDQ6nRz8_>JYUG#rdU0 k$*Bq{i6w~&iD@ONMG7S_)4%}(cOx4_1Hys8kYZo}0DJzQIRF3v delta 131 zcmdn#^4>w{KNmxYTad4tr%#A$5QBk0w8BK87RJ_%(~}rQE-;p1^^YVCHVjV diff --git a/win32/gui-2/filter.pas b/win32/gui-2/filter.pas index 7c4ab9a15..9b5b07614 100644 --- a/win32/gui-2/filter.pas +++ b/win32/gui-2/filter.pas @@ -1,7 +1,7 @@ unit filter; { - Copyright (C) 2005 Olaf Klein, o.b.klein@gpsbabel.org + Copyright (C) 2005,2006 Olaf Klein, o.b.klein@gpsbabel.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -81,10 +81,14 @@ type edWayptRadiusLat: TEdit; edWayptRadiusLon: TEdit; cbTrackRangeTimeZone: TCheckBox; - BitBtn2: TBitBtn; + btnHelp: TBitBtn; cbTrackFixes: TCheckBox; cbTrackCourse: TCheckBox; cbTrackSpeed: TCheckBox; + gbTransform: TGroupBox; + cobTransform: TComboBox; + cbTransform: TCheckBox; + cbTransformDelete: TCheckBox; procedure cbTrackTimeClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure cbTrackTitleClick(Sender: TObject); @@ -101,7 +105,8 @@ type procedure FormShow(Sender: TObject); procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); - procedure BitBtn2Click(Sender: TObject); + procedure btnHelpClick(Sender: TObject); + procedure cbTransformClick(Sender: TObject); private { Private-Deklarationen } lTrackTimeList: TList; @@ -169,12 +174,21 @@ var begin TranslateComponent(SELF); + cobTransform.Items.Clear; + cobTransform.Items.Add(_('Waypoints') + ' -> ' + _('Routes')); + cobTransform.Items.Add(_('Routes') + ' -> ' + _('Waypoints')); + cobTransform.Items.Add(_('Routes') + ' -> ' + _('Tracks')); + cobTransform.Items.Add(_('Tracks') + ' -> ' + _('Routes')); + cobTransform.Items.Add(_('Waypoints') + ' -> ' + _('Tracks')); + cobTransform.Items.Add(_('Tracks') + ' -> ' + _('Waypoints')); + cobTransform.ItemIndex := 0; + CurrentTime := SysUtils.Now; dtpTrackStartDate.DateTime := Int(CurrentTime); dtpTrackStopDate.DateTime := Int(CurrentTime); lTrackTimeList := TList.Create; - + lTrackTimeList.Add(edTrackTimeDays); lTrackTimeList.Add(edTrackTimeHours); lTrackTimeList.Add(edTrackTimeMinutes); @@ -231,8 +245,11 @@ begin cbTrackCourse.Enabled := False; cbTrackSpeed.Enabled := False; end; -//LoadSettingsFromInifile(); + LoadSettingsFromRegistry(); + + gbTransform.Enabled := (common.gpsbabel_vfmt >= '001.003.002'); + EnableAll(gbTransform, gbTransform.Enabled); end; function TfrmFilter.ValidateNumerical(AEdit: TCustomEdit; AMin, AMax: Extended): Boolean; @@ -314,6 +331,21 @@ begin Result := ''; + if gbTransform.Enabled and cbTransform.Checked then + begin + Result := Format('%s -x %s', [Result, 'transform,']); + case cobTransform.ItemIndex of + 0: Result := Result + 'rte=wpt'; + 1: Result := Result + 'wpt=rte'; + 2: Result := Result + 'trk=rte'; + 3: Result := Result + 'rte=trk'; + 4: Result := Result + 'trk=wpt'; + 5: Result := Result + 'wpt=trk'; + end; + if cbTransformDelete.Checked then + Result := Result + ',del=y' else + Result := Result + ',del=n'; + end; if AnyChecked(gbWaypoints) then begin if cbWayptMergeDups.Checked and @@ -561,9 +593,9 @@ begin ModalResult := mrCancel; end; -procedure TfrmFilter.BitBtn2Click(Sender: TObject); +procedure TfrmFilter.btnHelpClick(Sender: TObject); begin - WinOpenURL(readme_html_path + '#filters'); + WinOpenURL(readme_html_path + '#Data_Filters'); end; procedure TfrmFilter.LoadSettingsFromInifile(); @@ -693,4 +725,9 @@ begin end; end; +procedure TfrmFilter.cbTransformClick(Sender: TObject); +begin + cobTransform.Enabled := cbTransform.Checked; +end; + end. -- 2.30.2